Merge "Remove method level hiding within hidden classes." into honeycomb