[automerger skipped] Merge changes from topic "adbd_cp" into rvc-dev am:...
[automerger skipped] Merge changes from topic "adbd_cp" into rvc-dev am: 58d80650 am: cae22914 -s ours am: 7b31cc56 -s ours
am skip reason: Change-Id Ibfb92a7c197a25fd1913107d277fbc5f78108c05 with SHA-1 e36a53e3 is in history
Change-Id: I1312fa2defabf675b5e080fb16bb6789774b199d