Merge "Deprecate the old rebootAndApply API"