1df1ab60f2
Bug: 421611580 Bug: 426496161 Bug: 427607114 Flag: EXEMPT bugfix Test: Verified manually (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:991ceca0ae576169399f65000f99293f4ae515ca) Merged-In: I71139c5b61025ca30cfe8e70a5b09042f7078225 Change-Id: I71139c5b61025ca30cfe8e70a5b09042f7078225