[automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 am: 95c0a85b0b am: eba9f7a887 am: 50a4f794f5 -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 5e9c40c012 is in history
Change-Id: I8fd418b47adf50affaf0bc29d59b454c8920f7b5
This commit is contained in: