Merge \\"Optimize away useless masking operations on shift amounts.\\" am: f249230400
am: e3250eaf2e

Change-Id: If5eb9a5491ef3bbe0ec7308883b778f8fd9b4597