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

* commit '42935274055b0760a61d234f73a7c69bebc163f9':
  Fix shadow radius too large for RS

Change-Id: I166302f76457272bfbd22dabbb8174ac6641a139