Merge "[TNU05.1] Address aosp/1237036 leftover comments" am: 0ca532a7 am: 130ce397 am: fc5e8196 am: 3382b552 Change-Id: I5f19784d6ad4bf3c643bb91264fe4e9dbba31268