Bug: 145981139 Test: manual Change-Id: I86c6bfc0a6e28e634e0fd201e424b7ee6882ba2c (cherry picked from commit 6b14ea26)