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

Change-Id: Ic91d3495a7979750101b460814bcde5b7b0c48a5