aries: Updates for latest Pie

Change-Id: I8340b98b083c6bcb6168d55e7b57c6f71c7fb47d