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

Change-Id: I650211969d19051a5ba69ff86c1c3f087fcaa453