Bring changes from CM / Yanuar for Moto G

Change-Id: I0d69a9a6d2ae2eee9ac9afc1ef61aba80ba625f3