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