Merge "Add more mounting options to updater mount function." am: ac1ae4fd2e am: 609b8b5360 am: 46a7a3dfc1 am: f8b4108b4a am: 7597e86b14

Change-Id: Ide7805357a26af2e8f00b718db8e54354ddfe476