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

Change-Id: Iee394217f127e288f598ec802eb2b0b914823ff8