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

Change-Id: I963cc82a3062fef0b3ec7645c73b1c61a511d02c