Merge "[automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover...

Merge "[automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b4 am: 48397ba9 -s ours" into rvc-d1-dev-plus-aosp am: 6c83b747 -s ours am: 0d87822d -s ours

am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 dc5c86dd is in history

Change-Id: Icc18692a89dd227a0410a36ebceefe3b5582a2d5