Merge "Address aosp/1272946 leftover comment" into rvc-dev am: c0f0623482

Change-Id: If7ff9704558cb6126d7fd12160a8f38e1845700a
tree: 83af23fc5f13e5fd1566bc18bb3f3209d1312ab9
  1. tests/