am 6b21c965: am 467eda57: am 14ba13d4: am 2678d5bc: cherry pick from aosp. https://android-review.googlesource.com/63805

* commit '6b21c965059549397168991741474ebc75f02d4f':
  cherry pick from aosp. https://android-review.googlesource.com/63805
tree: a7b4b80d47de991c75aec45d101f09ffaebcae3a
  1. tests/