Merge "Merge "Fix clipping not being activated on children in groups" into...
Merge "Merge "Fix clipping not being activated on children in groups" into nyc-dev am: b6f64060 am: 680f73bf" into nyc-mr1-dev-plus-aosp
am: 021650bd
* commit '021650bd':
Change-Id: I89e1c019a94e6616477d632e6e8a396d32a85196