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

Change-Id: I7b1c723e0fbd20244c85141ae7735e26788f4268