Fix CodeInspectionTest for Setttings am: 27fad993b4
am: 04603ff928

Change-Id: Ib07ca5e031bd750b518c248bcbc0260ec6088a9a