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