Bring changes from CM / Yanuar for Moto G