Merge "Partial revert of "Align Theme, Theme.Holo, and Theme.Holo.Light with...
Merge "Partial revert of "Align Theme, Theme.Holo, and Theme.Holo.Light with Material attrs"" into pi-dev am: 4eca92d5
am: feff9762
Change-Id: Ic65bbb9a62243682a3a7815120c04074140fc54f