Merge changes I843fd9ef,Ife0a5721 into qt-dev
am: ab54fb71d6

Change-Id: I807e6f0ec88b499db56ccb69fec7e616ae1938d9