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

* commit '668579027bf4f474ecc5f14e53dfbd30a33ce939':
  Fix default clip to padding value Bug: 26779229

Change-Id: Ic784bb6300b7c8758a79b64bc49dbc6d930a3ed1