Unifying Moto G

remove from nightly for a while

ps2: remove whitespace from nighty
ps3: derp

Change-Id: I0b53d972b6ffed6d9131e93bcf329e9452df82b1