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

Change-Id: Ibbc8dd7bb869f76515c9f57793db02953dd07804