Merge "NanoAppFilter: Workaround HubId issues" into nyc-mr1-dev