Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest" am: 7c46a79a00  -s ours am: 7e3fdede58
am: c1ecf35052  -s ours

Change-Id: I670d004d2eb368b613f7cf2e7605a2c39e67293c