Merge "Helper function to mount snapshot devices in recovery"
am: 7cd37ba4dc

Change-Id: I4f032327aab79586e83c7d2b5bf1214c4ba53339