Removing references to emery in prep for emery's decommission

Change-Id: Ie1d354a2d421980c5ce158b993955ffb724eba18