am 29ffafb6: (-s ours) am 5b0da90a: am 1bab99c8: Merge "DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)" into klp-dev

* commit '29ffafb62c66dff3abb66dd6adcae68591421799':
  DO NOT MERGE Fix null pointer exception when updating rotation tile. (Bug 11111473)