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

Change-Id: I7c3bb2641c63461687e50f1150b874351edef0cc