Merge "Merge "Convert IR interface to AIDL" am: ba51f773dc am: 23e29e37ae am: f99bc98f9b am: 7c410c3693"