[automerger skipped] Merge "Fix the potential NullPointerException." into qt-dev
am:73bd1afc54-s ours am skip reason: change_id Ie6b5c293b4ca17622674d5f735a9d62e04410088 with SHA1590bf9a468is in history Change-Id: Iafd1a241ab301538720dba7c15ff2fde8a45673c
This commit is contained in: