Cherry-pick of: https://googleplex-android-review.git.corp.google.com/#/c/450447/ Change-Id: I629123567c907f0979e44998ef8d828b47059ec0
Cherry-pick of: https://googleplex-android-review.git.corp.google.com/#/c/450447/ Change-Id: I629123567c907f0979e44998ef8d828b47059ec0