Merge "Hide several System APIs"