Merge "Add test for NetworkSpecifier" am: 0619aec8 am: 38f689ec am: 00e86dfd am: 607bf05b am: 8f976a2c Change-Id: Ic670c355f661928483e42bc35b9a52d1d529a603