Update for 98936e7 deploy

Change-Id: Ib11de7f84145291fe0443d9ccfbd6df634bbf2de