Add Motorola devices and alphabetize

Change-Id: Ica4bd2ba5c382574f53bee5636260e12cec77c3c