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

Change-Id: I823c6b8e0fed71f34250662cd0db8c9477182177