Merge changes I88f247a2,I7e1daf93 into qt-dev
am: 3aac07ff6b

Change-Id: I26167cabb4c2f16684638d129889624a8e96b968