am e5d3170d: am 0524e97a: Merge "resolved conflicts for merge of 5a53816b to mnc-dev" into mnc-dev

* commit 'e5d3170d92add758ceac2167ba0feb81847bc5f3':
  Fix crash when shadowSize is 0