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

Change-Id: I2c6603ec31e32883af63c48ac895269f6a90663e