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

Change-Id: I54c9466dc87b004985d81c3592ccf990de46b7ae