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

Change-Id: I74a836381312aba711542170dc53df2d7e260876