Allow mount data to be specified
am: 81e2397c51

Change-Id: I03cfa3fc540409eaf9b0d2f7a1ffcefa1accf382