Bring changes from CM / Yanuar for Moto G

Change-Id: I76c9f501c8f721e99f0ebb27924bd54405e23722