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

Change-Id: I5c53e569bcdf1a4069370421e0737714d681981a