Merge "ServiceManagerNative: update for updatableViaApex"