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