Reapply fix from change I6bb72c0b to phones. Bug: 5071157 Change-Id: I9da5ee6cf72b148e5fef4de6e1c9328ccb4b28b8
5012047