Merge "Merge "Read clip to padding from attrs" into nyc-dev am: be35bd5005 am: ba0964752d" into nyc-mr1-dev-plus-aosp