am c7d7332e: am 93006d12: cherry pick from aosp. https://android-review.googlesource.com/63805

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