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