Merge changes from topic "cpcpcp" am: b25174e9d0 am: bcec691fd1

Change-Id: I8e9c1c4e99969342a339501ffe05023d82353387