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

Change-Id: I822d9276249ce8f332051a9bd643b6d436917cc5