Merge "Disable hidden API checks for Am"