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

Change-Id: Ia0922f3d3c4ed353fbdbd1c047051888299581ac