Merge "[automerger skipped] Merge "API to switch preferred data" am: 98b78236d0 am: 5d128c3e26 am: ab64d28254  -s ours"