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

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