Merge "Increase timeout when mounting adopted storage." into mnc-dev