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

Change-Id: I130416401cd75b72c0ce9e8da944474069195d77