Merge "Address API feedbacks for networktypebitmask"
am: 307f4cfeb1

Change-Id: I5dddd1258d2f8ad0e34098db921d309a6b1c243b