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

Change-Id: Iea59bc11783302b0404a8434d3a18e82a0bd0bac