Merge "API to switch preferred data"
am: 98b78236d0

Change-Id: Ib0fa8d95cce66889a75b762d2622c54de89f0c2f