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