Merge "Prepare for E MR1 that is linked against L SDK"