Merge "Remaining code review fixes" am: 942c597b00 am: 0fe0cbb263 am: 23024bc586
am: 1f98477d5c

Change-Id: Icf1ac7725f49d310d34a38304d2ab9a08baa8e9a