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

Change-Id: Ic11a61f05340f0b859b093c3a095c81538754f36