Merge "Fix inappropriate instruction code for AccessControlTest"