Consistency fixes for 15361a7ea6232a4493beef87809247c770b1cbf3

Change-Id: Ifafda600b602eda100ce96ca76b6f5f58b6a0769