Merge "Added cellular data service" am: 515895a471
am: 22d07592e9

Change-Id: Ib623ae5ee66c2305df22dc3dc19bc7660a85b9ae