Merge "Support for narrow operands in "dangerous" operations."
am: 0abc6bbde2

Change-Id: I56a8cc42e9c837769392f2db701034a0b959dddf