am fe6fd242: Merge "Mask out the non public bits, not the public ones." into honeycomb

* commit 'fe6fd242867022576a99fcd5fd6078fb7bab8451':
  Mask out the non public bits, not the public ones.