Merge "Fix crash." into qt-dev
am: b8337e9e12

Change-Id: Ia36caf670902980398c94ba18fa95abfe46c2b26