NanoAppFilter: Workaround HubId issues am: 3907049080
am: 41ef2a038d

Change-Id: I176e4a4698052d61fd5e9b29a2670a65dfb3643a