Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 am: 48397ba9e3

Change-Id: I6aaae02f4d23108e7b746cc0848e785e126e417e