trying again w/ amslvs1

Change-Id: Ie3cd62e6ac8ec5e31e27099c36fb80c859654eeb