Bring changes from CM / Yanuar for Moto G

Change-Id: Ic56d2fa4c9969592547d9b95d71dda7f8c3a84bb