Bug: 112657134 Test: Manual Change-Id: I4ffe5e3284478a6337136dbc79ec5eed72013cc4 Merged-In: I4ffe5e3284478a6337136dbc79ec5eed72013cc4 (cherry picked from commit b0ae02b6)