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

Change-Id: Iea664b4d0ee648153ceb4524e80331edf42590cf