Merge "remove activation button from preferred NW setting" am: 956e8707df am: 931ab9ddad am: 92d0c3bb40
am: d01f4d8994

Change-Id: Ic5be2a1fac2cf1c269d36c94bb9c3ced874a8a84