Merge "Support for narrow operands in "dangerous" operations." am: 0abc6bbde2 am: 3320599d5a am: 3b61c630a5
am: c0696fcb1b

Change-Id: If66db069557bedd36f8d732b65d9c93026f2b4fa