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

* commit '14ba13d4bceef04e586220bef386d3224eda4ae8':
  cherry pick from aosp. https://android-review.googlesource.com/63805
tree: 1a3fa37191b95f021329b41ac6d31ec6f01b0d75
  1. tests/