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