Merge "ContextHubManager: Document InstanceInfo bug" into nyc-mr1-dev am: 73f511e471
am: 3a41c5b654

Change-Id: I79c4ddea4969d7c187424e15b2ce22027f100ca3