Merge "Support for narrow operands in "dangerous" operations." am: 2cd620bde1
am: d89bd0f0b4

Change-Id: I49378af02afe3184195fb0e133e581c7f134bdac