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

Change-Id: Ib91456a530ba5fd8e67ae92046d52fbfe392bbb1