Merge "Verify error code when usage entry in use" into rvc-dev am: 6bd68c9660 am: c14031eb7b am: aec7696984 am: 1b76b4f8cf
Change-Id: I6aa64113801464c0738585de82791845ef394d90
This commit is contained in: