Merge "DO NOT MERGE - Check exported status in chooser" into nyc-mr2-dev