Merge "Fix the potential NullPointerException." into qt-dev
am: 73bd1afc54

Change-Id: Ice39d20d81e602f4e081a6fd2033c62be919bd33