So no need for the related entitlements.

Change-Id: I54ba7c0586ee77f30096b50755a9a85bbb7965a5
(cherry picked from commit a1379c6d)
(cherry picked from commit d78c567c)