Deployment preparation

Change-Id: If4554fedf3eec935ebb40f8532861f7090f19580