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

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