Merge "Skip call filtering when in ECB mode" into nyc-mr1-dev