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