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

Change-Id: I2a7a39e7df6d6dcf835619201b02fcfe500628d3