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

Change-Id: If695fe32c32fb597286c7de710a030259743ba17