Merge "Code cleanup."
am: a0a1b68fea

Change-Id: Ib0513d6efe5eddb6fe8a307d17fce96fed5647e4