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

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