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

Change-Id: I9b1608375979299c93654cb73f8f5c3f496d301b