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

Change-Id: I83bb99c73fcd2818105b51633ea8c5c42bcd74a0