Bring changes from CM / Yanuar for Moto G

Change-Id: I39798d1b433be3e874928b44521eddfb638c564d