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

Change-Id: Iec08afae474994508c1d666938b844a8b2544ee6