Merge "Set default preferred network only when registered on home network." into oc-dr1-dev
am: bf11e47562

Change-Id: I765666882f9f7c8f5f048e18ef648c885add50a3