We actually have 150 devices now, m7att changes

Change-Id: Ie1801366c869211aa68db1a5bb12f3a19099a9e7