Bring changes from CM / Yanuar for Moto G

Change-Id: I94b34a714ad613c776f4017c70fed88a7e419152