Merge "Enable Intent.ACSD restrictions"