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

Change-Id: I10bced277ec46a64837efc619e752b7f793c4aaf