Merge "Update data api / always on in Jumping Jack and Runtime Permissions...
Merge "Update data api / always on in Jumping Jack and Runtime Permissions sample." into oc-mr1-dev am: 6dd28a35 am: a937d73f
am: 6ba97035
Change-Id: I1b8b2d68ff5356ac183e4893163971402370b09e