Fix Galaxy (Aries)

Change-Id: Ic8e3e1b01fe54318d653773ee8146e2863916f71