Loading
Revert^2 "Temporary Revert to fix a Picker bug."
e48a17a9 Bug: 365751758 Bug: 365897548 Flag: EXEMPT bugfix Test: Manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a62c7361b132f51673f25900be68abce13a6148d) Merged-In: Iebd4c85bc6afc84793f9aa7d62799612a4a536da Change-Id: Iebd4c85bc6afc84793f9aa7d62799612a4a536da