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

Change-Id: I4a2f9c3900c5aadf86ff8d2e51dcfa490eed9d3f