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