Merge "Do not enter hidden API slow path when policy==Disabled" am: 2b89987412
am: d77e5924e7

Change-Id: I61a3289bbe875839e299f88d6fcfce750fd450a9