am 0979fd66: am f806c7a7: am 9a0d81ed: am 719b7c5e: am c7d7332e: am 93006d12: cherry pick from aosp. https://android-review.googlesource.com/63805

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