Merge "[automerger skipped] Merge "Fix the potential NullPointerException." into qt-dev am: 73bd1afc54 am: 580cd295cd -s ours
am: ea53d94fc5 -s ours
am skip reason: change_id I658fbba3e18c5c640ed7d445d2cd59c4221e055f with SHA1 4769936f59 is in history

Change-Id: Icb3f96e3bccb728f4ff8bba576afdd76c8810379