[automerger skipped] Merge changes from topic "adbd_cp" into rvc-dev am: 58d8065034 -s ours
am skip reason: Change-Id Ibfb92a7c197a25fd1913107d277fbc5f78108c05 with SHA-1 79a452a923 is in history

Change-Id: I4489ae092b58a53af6018f8382ec57ab2445ba6e