Merge "Add more mounting options to updater mount function." into rvc-dev am: 342e53d045 am: 700dc434dc

Change-Id: I4d16b365f83923a0e7a29f5f8dae290eb6be9cd2