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

Change-Id: Ifa66826705ede76483c1f0c71517bef5440591fd