Merge "storaged:Thread out of sync will cause null pointer crash" am: 2929ab63e3

Change-Id: I643b5246b809f72a8cf0b3c7013c40941b8d45ad