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

Change-Id: I13fbf5cfe1cd39e7b4e9b1038a4383bc4e15ffb9