Merge "Revert "Support for narrow operands in "dangerous" operations."" am: 1f68cb5ad8 am: 19e53fe84c
am: 407657332a

Change-Id: If8b990a6c5d5ed3962e156e8a2657908a8307f09