Fixing derp on motorola devices

Change-Id: Ic065f1080e76de72cec0f9c4bebcd836907b24ca