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

Change-Id: I7e688c501ac199fec8724c5cf4ebd095b073a4c2