Fix ABW list shapes

Change-Id: Ibbbfddf10677e8c5b654cee9c5fda1603a298a67