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

* commit 'f3254c6c2055c8f0fe524a8417d5ccc6335f9361':

Change-Id: I12fa3530a111c79dff0185c66131c25ed6335134