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

Change-Id: I24a71cc5dd7e6805b23b16c10bc3c000ac892774
tree: 5bee1c52e3df5420137e17ffcf6490018048f527
  1. tests/