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

Change-Id: Ie8a7f62675bf60436d1262098d0a550692d70b02