Merge "Address aosp/1272946 leftover comment" am: ebe9cb15a4 am: 1f9e324de0

Change-Id: I85fcc29ec0431fe147f442f507722cd7034a07af
tree: ff4cf9409acb6e1cbc33b04db49cbf8d9d5f7aa6
  1. tests/