Merge "Address aosp/1272946 leftover comment" into rvc-dev
tree: 83af23fc5f13e5fd1566bc18bb3f3209d1312ab9
  1. tests/