Merge "APF: Remove no-op code"