Merge "Fix sign extension issues" am: 4408ecbd73
am: de2f4a2fbf

Change-Id: Ifaad683e7de89bf80b9d4c6636de22a76ef75e5f