Merge "Fix targetSdkVersion for NetworkStack" am: 42b97de9d3
am: ba2f3d2fdf

Change-Id: I7be8a9f1020d56cdf9ac87a47a25cab77d66958e