Merge "Fix targetSdkVersion for NetworkStack"
am: 42b97de9d3

Change-Id: Id9786b9d607950990427316379c3bb46bf188703