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