Merge "Moved knowledge on masking shift operands to simplifier." am: 1a9a9e363b am: 5ae26e8e43
am: d0d4338abf

Change-Id: I4d6d7ff088cea239ef2e6a07d25e854e276168c2