Merge "Code cleanup." am: a0a1b68fea am: 3f4eb999df
am: 700e245428

Change-Id: Ia10920da1ecea07bc88b8ae873c548d85d73ee87