Bug: 37552457 Fixes: 37552457 Test: manual Change-Id: Iba980eb885b5a6465bafc12c9ee35831b7a4ff31 (cherry picked from commit d4def0c6)