[automerger skipped] Merge "Implement delete methods" into rvc-dev am:...
[automerger skipped] Merge "Implement delete methods" into rvc-dev am: 1e2e7410 am: c71f9fcd -s ours
am skip reason: Change-Id I8680164cf34bae2fac1f5431c03a3369dd6318ab with SHA-1 01c32e45 is in history
Change-Id: Ib271edd8c1f9f25251bb81ca7bf65859f9a7e9b8