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

Change-Id: I3e39fa5ff57e5e7b3d86fe602161b586a5cbb21a