Bring changes from CM / Yanuar for Moto G

Change-Id: I0f1fe9d376ec17d8368ff3f5f55673ad24cf5917