Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: a22fc9fa8e am: 549a259ef9
Change-Id: I70bba32884ed67ad8a798e7d50b5deddc6541966
This commit is contained in: