Merge "Fix sign extension issues"
am: 4408ecbd73

Change-Id: I52a6f8bc8abd8dc00f11e9ac16cf7e3706d47142