Merge "Merge "Remove last NetworkStack usage of hidden APIs" am: 16ec5d038c am: 4845df3ced am: 14062be8f2"