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