Merge "Added support for the new 1.2 data setup/deactivate API" am: a02d09a449 am: 8208b2ef2e
am: 4fcd48db4b  -s ours

Change-Id: If6c0ff777cd49e083c218755831854945fabf098