Merge "Address leftover comments on 923337 and 930217." am: 1e97aab6f4
am: 55a22b5d17

Change-Id: Ibbc8dd7bb869f76515c9f57793db02953dd07804