Merge "Log the error when uncrypt timeouts" into nyc-mr1-dev