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

Change-Id: Ibdc23df2da0b8ea387f54169224e467a37466cff