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

Change-Id: Id9c8851a3a3e493c47a4bb100c953723289be1fe