Merge "DO NOT MERGE Revert line from master-cp that should be different in qpr1" into qt-qpr1-dev
am: a01c818e28

Change-Id: Ifee450bcf15588fa1ce2ea4815730c626b781795