[automerger skipped] Merge "Fix the potential NullPointerException." into...
[automerger skipped] Merge "Fix the potential NullPointerException." into qt-dev am: 73bd1afc -s ours
am: 887c167f -s ours
am skip reason: change_id Ie6b5c293b4ca17622674d5f735a9d62e04410088 with SHA1 590bf9a4 is in history
Change-Id: Ie239308c22fda3f9cbab1aa58f6f79f3a7da3e3d