Update deployment build, fixes for class_alias issues

Change-Id: I0579c7e7ab8a6fb886fbf19a0016bbc40f93cc0d