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

* commit 'f7f84d90f6eeb6c5abe9c2e2f676692bf7e476f6':

Change-Id: I8d57fe9bb7021954e253d7c2bfe401da3e46588d