Changes from https://bitbucket.org/juhahyva/servicefusionarsensorsactivity till commit da2b71d