Merge "Fix cast tile crash" into oc-dev
am: a69a6ed505

Change-Id: Ic451cd15fe26c35d9db514071706a42414e8af98