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

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