Merge "ContextHubManager: Fix API documentation." into nyc-mr1-dev
am: 1e07e392c3

Change-Id: I03e23ebfe2a29aecc77048edd56797f9fcf24899