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

Change-Id: I75eadb66c81d72c768e77feddd383d60f8accd65