Merge "Rearrange styles and remove the same attributes as the parent style" into rvc-dev am: b0230a6106
am: 29dded7d48
am: 04eb15b5f4
am: 3502d21e2f
Change-Id: I163c77027a81a109d03c2e2424712acd23e855bc
This commit is contained in: