Merge changes I38958555,Ie6879de8 into qt-dev
am: bc809c8d5f

Change-Id: Icd1e3714929ab0e733bc543dae0d772e5e368767