[automerger skipped] Merge "DO NOT MERGE Revert line from master-cp that should be different in qpr1" into qt-qpr1-dev am: a01c818e28
am: 867851433f -s ours
am skip reason: subject contains skip directive

Change-Id: Ic43262f3336c574d642e91f0b911f3ccadfff47c