Merge "Mobicore: Update internally managed branch"