Merge "New pref toggle for network recommendations." am: a5249906ab am: 2b03ffb264
am: 6061ca1b1a

Change-Id: I05753f7a5d54cd7707531c0a6cd9491c081454b3