Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738 am: cf33fd7910
am: 3659363d06  -s ours

Change-Id: I40d4f12980f2068e1ad81d1c69ef0bb0489dcc80