Merge \"Merge Theme.Micro and Theme.Material.\" into nyc-mr1-dev
am: 458b716597

Change-Id: I359a10ef14a2dca22fdccbfcbbcbfe4ac55ddc22