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

Change-Id: I8c49b9296e863244bf49ff806d319b2e1be326be