Merge "Remove the NetworkScore class." am: d1edb37a am: 709ec7c7 am: 6e8621df am: 13c62a51 am: ebfda387 Change-Id: Ib5f540070222865260c16c7182cc13c710a243c2