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

* commit '0979fd6697e4880cbcfd67b76ac71d8b5ad77f90':
  cherry pick from aosp. https://android-review.googlesource.com/63805
tree: cd7259b534009339e0b65cfa1446dd053a82f3e0
  1. tests/