Merge "Remaining code review fixes"
am: 942c597b00

Change-Id: Ib20efe9c3d6120045767ef3c27f2276ece6c41da