Merge "Address aosp/1272946 leftover comment"
tree: 5bee1c52e3df5420137e17ffcf6490018048f527
  1. tests/