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

Change-Id: Id29e65bd455c704738618f1dacfcad53b8d0b773