Merge "The Entitlement key map was not being cleaned up." into rvc-dev am: bd8e573e0c am: 5bedd9c4ad am: fbd9ca7eca am: abb27ddfcd am: 3c7845e738
Change-Id: I3e279f515ff084ad678b56bb2cc9314aa1c13efe
This commit is contained in: