Merge "NanoAppFilter: Workaround HubId issues" into nyc-mr1-dev am: f8d61675ac am: a0ce60d36f
am: 429b812811

Change-Id: I710253406aa0940dc7214d160260757d251ccc96