DO NOT MERGE - Check exported status in chooser am: 7bae18232e
am: 45fa749c5a

Change-Id: Ie308e49d410863c643c13256076a3ed83c934adc