cherrypicked from https://googleplex-android-review.git.corp.google.com/#/c/701360/ Change-Id: Idd5da29c25dd9d1597f253c8ba5357838c8b6c8c
Change-Id: I5c1ac7645dc68c28da97f46babcab5926c38dbea