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

Change-Id: If4c053c13d94f0ba9d251d763ec7ee97564ebe7d