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