Merge "Fix wrong mov instruction size." am: dc0edb586d
am: 8caf7a10d0

Change-Id: Ie0b79f4fef6ea97e2ac66debec8a95248093a58d