Merge "DO NOT MERGE: Fix test failure in CodeInspectionTest"