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

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