Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: 6fd344812d am: 8118bb3bc4 am: 85dd06e0ef
Change-Id: Id508b80b35b39112a719e2614f5e3adb199bb9f8
This commit is contained in: