Merge "Address API feedbacks for networktypebitmask"