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

* commit 'dc42c9085e5342abd62b81a4510b351f41c7f89d':

Change-Id: I4b40e7339a906125afabff9eb43447df54522187