Bring changes from CM / Yanuar for Moto G

Change-Id: I6905d50f46928e9513dec291cd53d5653d1c4834