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

Change-Id: I29125d47627ccd3c7d6d7d524d8e2b6a0e1336ec