Merge "Revert "Support for narrow operands in "dangerous" operations.""
am: 1f68cb5ad8

Change-Id: I8ae57f9a6df9622c78fac93b1ce234ddf37ca2ec