Merge "ma_listener: correct bounds of array" into pi-dev
am: 4d22d3e895

Change-Id: Ib6fe76f5cf1ccd1523b12808e71a2563af10d2c1