Add option to create metadata mount point am: fe305ab286
am: 36bd69f826

Change-Id: Ie79d296d867b5166e14b9c5ddf57ce06ec6c9276