Merge "[TNU05.1] Address aosp/1237036 leftover comments" am: 14fb7f6fac

Change-Id: I9276b698b97d317ba465ab162d191c05841593e0