Merge "Fastboot AIDL additional changes"