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

Change-Id: I189333c712c0ec1f59ef09f57baeb450797c6448