Bug: 77500217 Test: make jdiff Change-Id: I24f925b805e41e90f07e16ed977a083c5e289a51
mentioned in commit 163e3cac