Merge "Address leftover comments on 923337 and 930217."
am: a9b8e31cf8

Change-Id: I733160ae51b8f0e80f78ab375cdb0a547b74f68d