Bring changes from CM / Yanuar for Moto G

Change-Id: I86b8c9c257e1321457a40e93c5c74e85cfcb3578