[automerger skipped] DO NOT MERGE Revert line from master-cp that should be different in qpr1 am: 42216b5eeb
am: 949087d8ea -s ours
am skip reason: subject contains skip directive

Change-Id: I38df28e211243b54f2bf342a2b554b7e23b3bff9