Merge "Fix the permission of stashed blocks created by updater" am: d882b8892a
am: deb2a29a42

Change-Id: I66602230756a9a1c8c6208441f83e7e1703e926c