Merge "Support for narrow operands in "dangerous" operations."
am: 2cd620bde1

Change-Id: I84c821efe498de2bcee75777e38bf66abecf9b4b