[automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 -s ours am: fa5d45614b -s ours am: 0172dec0ca -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 5e9c40c012 is in history
Change-Id: I4f3f765216daec3621d6944eb221b2ca0fa5ebb6
This commit is contained in: