Gulp Sherah's latest changes for deploy

Change-Id: I225c6692cd1bbb463539b3f4e4b24d552a5bd00b