Merge "DO NOT MERGE - Check exported status in chooser am: 7bae1823 am: 45fa749c" into nyc-mr2-dev-plus-aosp