Merge "Fixing issue with larger clip bounds being specified than in the view." into nyc-dev am: 608f65b
am: 908beb7

* commit '908beb79ef780cea9e197cb47edfc9e6236a1fbf':
  Fixing issue with larger clip bounds being specified than in the view.

Change-Id: I646992654d5a66b45e993c5696b3dd7c0eb5f0a9