Merge "Retry ioctl in uncrypt if it returns block# 0"
am: ceafe69fb8

Change-Id: I5fa4c97672520c2ec47e2bbb55b55c5f54417dc7