DO NOT MERGE Revert line from master-cp that should be different in qpr1
am: 42216b5eeb

Change-Id: I761ee3c126a4ade6a28cd93b8bbdebb95f58d787