Merge "Fixed crash in data service" am: 7fab753180
am: ab5a5e8a58

Change-Id: I38fcae7f92de719ec49e3ecc4d630c0ec02b3e33