Merge "[DO NOT MERGE] resolve merge conflicts of 079d81a4799a75e03a19148ed287e491142dd4c7 to qt-r1-dev" into qt-r1-dev
am: c982441edb

Change-Id: Ib4f75dc6c42b3ab7057ffbd0504850d77d3448d4