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

Change-Id: Ie419367d7bbbde1ff69e6c28aa500ae8b8f2a198