Merge "Fixed unsafe lock upon safe media volume"
am: cbcaabedfd

Change-Id: Ic015a148011a1bf12cb8457ec56db8991747f8e2