cherrypick https://googleplex-android-review.git.corp.google.com/#/c/731348 Change-Id: I974704d5d555d1a00c6f22037cb45d49ca3c909d
Change-Id: I5c1ac7645dc68c28da97f46babcab5926c38dbea