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