Merge "Update to hidden APIs"