Rearrange styles and remove the same attributes as the parent style

Bug: 152831413
Test: visual
Change-Id: I9264d9385e923ee527714a28dcaf7cb7200d6007
1 file changed