[automerger skipped] Merge "Address aosp/1272946 leftover comment" into rvc-dev am: c0f0623482 -s ours

am skip reason: Change-Id I6272d7b297bdf0e641612a09ffe12942cc2b42e1 with SHA-1 e5e8ae9e1b is in history

Change-Id: I2c792e8e3dbeeafc840cdc1e3100a7209d331d7e
tree: 3b1be76fa7f6458077962c53f0070740c1f55e9e
  1. tests/