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

Change-Id: I95e8b9fe1e0a90c1ad6370be54c3d99cc10c1bc9