Merge "Add null checks to EMBMS AIDL impls"