Merge "Address leftover comments on aosp/894233"
am: 8781aa3fbe

Change-Id: I87f120778b2dc6743edc7fdd4e5390b68de05590