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

Change-Id: Ibc24e7705848e5d9dcd0c991c6594276788b039f