[automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 -s ours am: 06df90b1f4 -s ours
am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 7986731f16 is in history
Change-Id: I9999c09894e1322150a9bcb4989af3c33c7f0ec0
This commit is contained in: