Merge "Fix default clip to padding value Bug: 26779229" into nyc-dev
am: 3b19d52acd

* commit '3b19d52acd409740c91743305798f2229b912412':
  Fix default clip to padding value Bug: 26779229

Change-Id: I1ba228b87951d0463ec99b609bf63bba8ec91c71