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