Update deployment build, fix for double pencil and i18n changes

Change-Id: I3c591f2bab308be0a6cc9d52c74e9805b032c9e6