Merge "Modify ContextHubHAL"