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

Change-Id: Ia903342d29b25d74319b97511da7950006a36600