Merge "CP ag/9571636 from master to qt-qpr1-dev Bug: 143299398" into qt-qpr1-dev am: 923adf473d

Change-Id: I8460153a466f42edc0db046c38a10167bb8927fc