Fix out of bounds access am: 976672fa32

Change-Id: I95df222798f99c7bf9ca5a6fb24e2597314e0034