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

Change-Id: I716c9ed045baa6d7cd4fb0e0c7bffeaa4a732803