fb11cee3a2
Bug: 337863494 Bug: 384896306 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0556a5218536c187ea046f07173735cc80dbdf0c) Merged-In: Ic282797a81a403b97716dc28608365f1aa8f2709 Change-Id: Ic282797a81a403b97716dc28608365f1aa8f2709