Merge "Added support for the new 1.2 data setup/deactivate API" am: a02d09a449
am: 8208b2ef2e

Change-Id: I699cc911c200c3f8d4390f19fc4cfb009c6090e9