Bug: 111215173 Test: manual Change-Id: I98c122fea64cb33a9b0986254685091bcc8a951b (cherry picked from commit a1840869)