Unstick AM

Merged-In: Iceeb3851aed0ba9b1c2c50b1a2378df06faa29d6
Change-Id: I448734c09c2b8c84f9be8ac7673783f0fe88e0b5