Merge "Allow to exempt from entitlement check" am: 7a2b6a8ad2

Change-Id: I1252b9670efa16118d428cda2ab94e2dca757090