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

Change-Id: I1e6cce3464a5235ea53d9ddd9987bc84ef88489d