Merge \"Phone theme updates.\" into nyc-mr1-dev
am: 46ea2605c2

Change-Id: I1a3a1107be2ab9e8befd22c7f171260a2b7c8013