Merge "Remove main thread assertion from test" into nyc-mr1-dev