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

Change-Id: Iaeb8fade7b168bd1b9b8e0edcea4f2faf5b313a9