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

Change-Id: If6a4c363405bf45535e7185aae02e56e858d7f14