Merge "Do not check for existence of exported dirs." am: ef7ff204e2
am: c6632130aa

Change-Id: Ib939b7d3cc79775d397014dc8f9201c368fbc998