Fix ABW embedded images

Change-Id: Ifd33ea9c1f91865d5ae5175eefa9b65107404bf0