Merge "Sign networkstack with its own certificate" am: fd2d7dc685
am: 0c5872595a

Change-Id: I1cca500ca0c65ae04d0e1b99e04a15f5e11853c1