Devices have been updated to M. This reverts commit 95303c68. Change-Id: Ib6620f88b939700e53af87d2003ea8bbe222e1bc