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

Change-Id: Ie644f999d96a853bbacfa499fc261bb9ff790b49