Merge "Fix NullPointerException." into qt-dev am: 19bc3c67ab
am: ffd730ccbb

Change-Id: I4f98b120470664b1cd9e60b9253693ec11197b8e