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

* commit '6917aa861a611e71e7dc176f3f8c1f7ffab5a4f8':
  Fix default clip to padding value Bug: 26779229

Change-Id: Iff9094eb07238f98975aea2a6b310e119f970428