Moto X modifications

Change-Id: I95be7f9a30bad1e882d80c42fca4c52e6bcabbe7