Merge "Fix shadow radius too large for RS" into nyc-dev am: 924d8227c4
am: ef79274692

* commit 'ef7927469226df2a41f9b83528fc29787a439af9':

Change-Id: Ieb8c9e27439d822cf1c72fe5e4c6b08b77142d6c