Materal style backports/fixes

BUG: 30557479
Change-Id: I89abdb84b6cc9745e02d0233244e97623376c626
1 file changed