Merge "A1 interface Support instead of O1."