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

Change-Id: I5e57a26d88bfd4906eb2d80db5cd00d4898a65d8